<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <title>Title</title>
</head>
<body>
<<<<<<< HEAD
<h1>登录页面</h1>
=======
<h1>这是首页</h1>
>>>>>>> origin/master
</body>
</html>